Merge "Dedicated Smartspace handling for Dreams." into tm-dev