am b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent." into gb-ub-photos-carlsbad

* commit 'b04dcdb5cea6ac42f8ba0d699dc45e965d104a5e':
  Don't go into Gcam when it's capture intent.