Merge "Informing app idle listeners on enabled state changes." am: 8c43f731cf
am: 1dbfcbc6f1

Change-Id: I06a21081e46a6773c1716329f7754f6ad00ae6d2