Merge "Reorder style items in shared libraries"