Merge "Fix CompatUILayoutTest#testOnClickForSizeCompatHint" into main