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

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