Merge changes Id6161f92,Ie0d8849a into rvc-dev

* changes:
  Introduce security checks to startDreamActivity
  Add verification for setting ACTIVITY_TYPE_DREAM