Merge proposals dependent on lp:~allenap/launchpad/freedesktop-importance-flip-flop-bug-707478

1. freedesktop-importance-flip-flop-bug-707478
2. Dependent merge proposals