Merge "Fix the elements below smartspace in weather clock move when there's event on smartspace and there's aod notification icon" into main