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

Change-Id: I08967a79847a0d42a0a5c67d2bb178d2717eae33