Merge "Fixed focus issues with left side panel" into main