Merge "Force consuming system bars if nav bar is shown forcibly" into udc-dev