Merge "Do not set camera preview display if the surface is null."
tree: 39df5e3d5fdff528f8fa8ab364b07dde2b90fc75
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/