am 8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent"...
am 8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into gb-ub-photos-arches
* commit '8a415f45':
Don't allow switching to filmstrip in get content intent