Merge "Merge "Do not hide caption for hiding navigation bar flag" into qt-dev...
Merge "Merge "Do not hide caption for hiding navigation bar flag" into qt-dev am: aae9d6c7" into qt-dev-plus-aosp
am: f5beb399
Change-Id: I3c21d0fc8be4c99f7cfb10f8ed1b72d183b59e25