am 24d94d61: Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad

* commit '24d94d6140ee5ecdf66b28218e8dd9dfe5edfb19':
  Workaround to prevent the data focus callback.