Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev