Merge "RESTRICT AUTOMERGE Revert "Camera: Fix missing onPhysicalCameraUnavailable"" into tm-qpr-dev