Merge proposals dependent on lp://qastaging/~smspillaz/unity/unity.kindof_fix_977189

lp://qastaging/~smspillaz/unity/unity.kindof_fix_977189 has no merge proposals.