Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev