Merge changes If4e2ba62,Iefd7e8e8 into tm-qpr-dev

* changes:
  Move private methods together below overriden public methods.
  Refactor deeply nested rim animator into three cases for scanning, success, not successful