Merge "Add mechanism to help manage multiple system perf hints from SysUI" into main