Merge "Merge "Camera: Skip extension processing if session is not valid" into main am: c8ad186151 am: 4883dc2476" into main