Merge "Fix wakeAndUnlock immediately after sleep." into tm-dev