Merge changes Id1278b07,Ic3da5046 into nyc-dev

* changes:
  Fixed a bug where expanding by touch wasn't possible
  Made sure the fake shadow won't be invisible