Merge "Initialize the appcompat system property folder" into main