Merge "Do not unnecessarily re-inflate camera preview" into qt-dev
am: 50b0e89362

Change-Id: Iba7abe2b382d75fdf69d6a07ea0d999ee391919c