Settings: cleanup and update push service

Change-Id: Ibe3f0cea57ff2db4951c4d57f8fdc62387fbdbe7