Merge "Reorganize PiP flicker code, move apps tests to new target" into main