Merge "Fix overlap between weather clock and smartspace" into udc-qpr-dev