am cac4cedc: Merge "Show the action bar and edit button when system clear full...
am cac4cedc: Merge "Show the action bar and edit button when system clear full screen flag." into gb-ub-photos-carlsbad
* commit 'cac4cedc':
Show the action bar and edit button when system clear full screen flag.