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