Merge "Add logging for Smart Space on Dream surface." into tm-dev