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

Change-Id: Id8db095a4387c3904523d5b6c77635637a5f7aef