Merge changes from customizer-library.