Merge "[13/n] Create Overrides and Policy for App Compat Camera" into main