Add gapps, merge changes into local branch for notifications.