Merge "SF: Track and consider all displays for mode change pending state" into main