Merge "Prevent pinned stack from having extra elevation" into nyc-dev am: 0f01857
am: d3e36b6

* commit 'd3e36b67263557aa263e9266abdf9be02c75cb5b':
  Prevent pinned stack from having extra elevation

Change-Id: Id1b93d761c2b37d3aeaf71fb63e3f2c6cef315f1