Merge "Re-inflate views in onOverlayChanged." into qt-dev