Merge "Fix the color of dot wrongly in device admin page" into sc-dev