Merge "Add config_defaultDisplayCompatActivity" into main