Merge changes Id1278b07,Ic3da5046 into nyc-dev
am: e45ed15

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

Change-Id: I0d745797554b733d1be8b48137d0b76cb8001a0b