Merge "Only count EVENT_ONE_HANDED_TRIGGER_ROTATION_OUT in STATE_ACTIVE" into tm-qpr-dev