Flash Notifications: make sure proximity sensor gets unregistered if the feature is shut off

Also refactor code slightly to make more sense-- not all members need to be in the outter class

Change-Id: I70c2145556badfbebb487f40a0e8c3362ad9b251