Merge "Merge "Remove isV2App" am: 992356cc83 am: 0c0ea183d7" into qt-dev-plus-aosp