Better management of gapps notifications