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