Merge "SnapdragonCamera: Fix ANR caused by layout logic" into camera.lnx.1.0-dev.1.0