Merge "Fix issue where focus is retained after call." into main