Merge "Revert "Fix 6360834 Select All is shown in place of Deselect all option"" into jb-dev