Merge "Fixing smartspace position on lockscreen with big clock visible on large screens" into sc-v2-dev