Merge "Prevent pinned stack from having extra elevation" into nyc-dev