am 7e162d29: Merge "Fix ANR in PanoramaModule." into gb-ub-photos-bryce

* commit '7e162d290696fe06442fbf090b2714a77297642f':
  Fix ANR in PanoramaModule.