Merge "android:ui crash on longpress of empty tile" into pi-dev
am: 7a8aac8c6e

Change-Id: I49deb50169e0245025caceb5bdf65f515f45ce8f