CB-5892 - Remove deprecated window.Settings
Merge remote-tracking branch 'upstream/master'