GApps chooser/bug fixes