Merge "Add unit tests for TaskbarKeyguardController" into tm-qpr-dev