Merge "Tweaking stack shadows and layout." into nyc-dev