Merge "Support excluding persistent UI" into main