Merge "Enable NFC-EE immediately when screen is on but locked." into ics-mr1