Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into qt-dev am: e8ba34a8 am: a4967992 am: 78059be7 am: 686f21bb Change-Id: I8bd78323f45a776db2aa7825f6104c13ed35cbf7