Merge "Do not hide caption for hiding navigation bar flag" into qt-dev