Merge "Camera2: Set appropriate template for pre-capture" into rvc-dev