Merge proposals dependent on lp://qastaging/~osomon/moovida/player_feedback

lp://qastaging/~osomon/moovida/player_feedback has no merge proposals.