Merge proposals dependent on lp:~dpm/help-app/phone-theme-fixes

lp:~dpm/help-app/phone-theme-fixes has no merge proposals.