Merge "Fix a bug about missing onConfigurationChanged" into qt-dev
am: a54b943d59

Change-Id: I276e822663cde616a21f49332f6f9161ec69a550