Merge "fix [2313526] sensor enable race condition"