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

Change-Id: Id7c5b39533776c1334ceced857daac20cc1a2f1b