Merge "Simulate extra navigation bar for fixed rotation" into sc-v2-dev