Merge proposals dependent on lp:~jeremywootten/pantheon-files/fix-1592068-viewmode-buttons-do-not-update

1. fix-1592068-viewmode-buttons-do-not-update
2. Dependent merge proposals