Merge "Remove flag page_size_app_compat_setting" into main