Merge changes Ifd7bc217,I337d0189 into tm-qpr-dev

* changes:
  Allow UserSwitcherActivity in LockDownTask mode
  Transitions - Legacy dream -> lockscreen flicker