Merge "Fix battery saver switch test case" into udc-dev