am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is...
am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches
* commit 'a0d84367':
Do not show bottom controls when undo bar is visible