Merge "Smartspace - Do not listen for user changes" into sc-dev