Merge proposals dependent on lp:~boiko/address-book-app/fix_settings_button

lp:~boiko/address-book-app/fix_settings_button has no merge proposals.