am 3180ac90: Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad

* commit '3180ac90af3e63ed7d9b487de5a35ba216d9463f':
  Fix SRI UX issues and improve UI efficiency