Bug 959109: Screen change checks only for screen change.

Fix: Screen change should only be listening to screen state, not the nfc events enabled state.