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

Change-Id: I7d101eaf4d63f45dd80415be531c6346e45efb37