am 8f3523b0: Reconcile with jb-release

* commit '8f3523b020c5fd12f4b358a4f34fe1e108145ccf':
  Bug 6605167: Turning off FUL during error counts as attempt
  Protect against bogus input for ListViews