am fc5a0222: Fix 2582241: Update selection based on user setting instead.

Merge commit 'fc5a02225e8bca21f07543f55e1b51a33670c501' into kraken

* commit 'fc5a02225e8bca21f07543f55e1b51a33670c501':
  Fix 2582241: Update selection based on user setting instead.