Merge "Make tv menu mode switch wait for focus change" into main