Merge "Add workaround for b/124210145" into qt-dev