Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev