Merge "Revert "Moving smartspace to the right on the lockscreen for split shade"" into sc-v2-dev