improve android-pip and android-fullscreen branch