Merge "Make preference title align after icon" into sc-dev