Added condition for empty check.
Merge remote-tracking branch 'upstream/release-6.6.3.a1' into release-6.6.3.a1

* upstream/release-6.6.3.a1:
  drop down container hide on firefox issue resolved
  Changes for clear all filter resolved
System: Fixed issue with wrong user id login.
Merge pull request #2470 from anilgooru/release-6.6.3.a1

Cherry picked - 250c358354a38ed4abe475fa5cebbd10628037d0