Merge proposals dependent on lp://qastaging/~phablet-team/gallery-app/gallery-app-desktop-scrollbars

1. gallery-app-desktop-scrollbars
2. Dependent merge proposals