Merge changes I40acd41d,I3bc15180 into tm-qpr-dev

* changes:
  KeyguardViewMediator - Remove unused code
  Transitions - add tracing