Merge 5.x Branch into existing 5.1.1.x

Issue #3380579 by jldust, Shreya_th, pixelwhip: Move settings into theme section within the libraries.yml