am 07072c8a: Merge "add options announcement to onscreen options indicator" into gb-ub-photos-denali

* commit '07072c8a213e1e884f372d0df8c98ac0429acf1b':
  add options announcement to onscreen options indicator