Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread