Merge "Fix overlapping problem on running services page" into sc-dev