Re-organize device setup and add missing packages
Tell gapps not to re-activate the device