Merge "Don't require awakeKeyguard for activeUnlock" into tm-dev