Merge "Don't poke user activity when unplugging unless screen is already on."