Merge "Tweak UI for make profile pattern visible" into sc-dev