Merge "Merge "Add workaround for b/124210145" into qt-dev am: a8cf1061 am: a451bbe5" into qt-r1-dev-plus-aosp