Merge "System Perf Hints in PiP" into main