Merge "Fix overlap with smartspace and weather clock when changing display" into udc-qpr-dev