Merge "Correct wallpaper color tabs height" into sc-dev