am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not...
am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
* commit '51881e02':
Do not show Camera placeholder when not appropriate