Merge "Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev am: 7afbe54e0d" into oc-dr1-dev-plus-aosp