Merge "Increasing speed of customize widget button" into main