Merge "Merge changes I8bdb4c74,I613a7d03 into qt-dev am: a09ee2d39f am: 036d594c69 am: de90a881a7" into qt-qpr1-dev-plus-aosp