Merge "resolve merge conflicts of bb8b7e57c2a7d36213253829d4401003d526d8a9 to qt-dev-plus-aosp" into qt-dev-plus-aosp