Merge "Revert^2 "Only write appcompat properties if flag is defined"" into main