fix notification selection.
core-5054 fix shell script viewer
core-5057 fix pref validation issue
Merge branch 'master' into STABLE