Merge pull request #2269 from anilgooru/release-6.6.3.a1

DO-6069 : 1.0.d [Home] hover on Feedback shows "Classic Gooru" at setting drop down - Fixed.
DO-5688 : 1.0.c www [System - Marketing Popup] New in Gooru Pop-Up should only appear for existing users (not 1st time users) - Fixed.
Merge remote-tracking branch 'upstream/release-6.6.3.a1' into release-6.6.3.a1

* upstream/release-6.6.3.a1: