Merge "Show and hide smartspace (2/3)" into udc-dev