Merge "Fix SysUI volume controls not appearing" into sc-dev