MP1-4231 : Fix issue where enable disable wouldn't save
MP1-4231 : Spacing updates
Merge remote-tracking branch 'remotes/upstream/MP1-4231-FEAT-Allow_plugins_as_Screensavers' into 1.5.0Fork