Merge "Position app with short aspect ratio opposite of nav bar" into oc-dr1-dev am: a40af83c32
am: 8d99ed44f2

Change-Id: I28cee4719647f5c1746e62fe8c73ebdc99be6c65