Merge "Put shell on the idle/background whitelist"