Merge "Dismissing Customize Widgets pop up after time out" into main