Merge "Fix resolving TvSystemUI intents" into main