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

Change-Id: I9fb617095fc34543cf5d3e35f3ddbb6fd56b3910