Android: More fixes for rightclick