Merge "Don't show button if fullscreen override is from system" into main