Merge "Merge "Prevent pinned stack from having extra elevation" into nyc-dev am: 0f01857 am: 6e6a6ee" into nyc-mr1-dev-plus-aosp