BugFix #4305

Signed-off-by: Umair Khan <omerjerk@gmail.com>
Merge pull request #986 from omerjerk/QA_4_1

BugFix #4305
bug fix #4040:Since we are not reseting theme on reset settings, so removed the block that were unsetting theme in seesion

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
Merge pull request #992 from smita786/QA_4_1

bug fix #4040
ChangeLog entry

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '3e5fb52'
Merge commit '908df2a'
Merge commit 'cc7f1bf'
Merge commit '54220a3'
Merge commit 'be06786'