Merge "Remove opposite position of nav bar for short aspect ratio app"