am a9ec0ea5: Merge "Fixed ANR in VideoModule." into gb-ub-photos-bryce

* commit 'a9ec0ea5080a3ff96e8be3489541792577a1c417':
  Fixed ANR in VideoModule.