Merge "Camera2: Unhide some capture request templates"