Merge "Keep smartspace session object" into udc-dev