am 11a3c9c6: Merge "Fix 6360834 Select All is shown in place of Deselect all option" into jb-dev

* commit '11a3c9c68185f05eb390697f5c037c6000aea6de':
  Fix 6360834 Select All is shown in place of Deselect all option