Merge "Add some Settings APIs to light grey." into pi-dev