Merge "Added fake shadows in order to have the shadow nicely fade in" into nyc-dev