Merge "Polish navbar while quick switching apps with different orientation" into udc-qpr-dev