Unity

Merge proposals dependent on lp://qastaging/~jassmith/unity/fix-coverflow-crash

  1. fix-coverflow-crash
  2. Dependent merge proposals

lp://qastaging/~jassmith/unity/fix-coverflow-crash has no merge proposals.