am 71686048: Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad

* commit '716860487554b5e214d355f88effc9b8c316d54e':
  Update bottom edit control for photos inside secure and insecure mode.