Merge "Make resizeable activity override public and introduce proto for CTS" into main