Merge "Position app with short aspect ratio opposite of nav bar" into oc-dr1-dev