Merge "Add System Back function to SystemUiProxy" into sc-dev