Merge changes I7c63d523,Id0ac7d06 into udc-dev

* changes:
  [Bugfix]migrate user restrictions to DevicePolicyEngine
  Fix bug in screen capture and lock task migrations