Merge "Fix overlapping problem for device admin page" into sc-dev