Merge "Remove accessibility focus on add more widget icon" into main