Merge proposals dependent on lp://qastaging/~artmello/gallery-app/gallery-app-avoid_reload_fullscreen_toggle

1. gallery-app-avoid_reload_fullscreen_toggle
2. Dependent merge proposals