Merge "Prevent unneeded scanning in SystemUI routing components" into main