Merge "Make user aspect ratio settings override public and introduce proto for CTS" into main