Merge "Add callbacks to indicate NFC setControllerAlwaysOn state changed"