am 7c8d6957: Merge "camera2-portability: Fix zoom occasionally not working" into lmp-dev

* commit '7c8d6957b96c75ce11f7373f4ab2451ee4666360':
  camera2-portability: Fix zoom occasionally not working