am fb1884f6: Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad

* commit 'fb1884f63beb3ab4c94b09aea91b5ad501bc6af6':
  hide popupmenu during rotate