am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup...
am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
* commit '413c7109':
Stay in AlbumPage when dismissing a popup from AP