Merge "Don't exit doze-light on motion event" into pi-dev