Merge changes from topic "sc_reverts_for_b_183104573" into sc-dev

* changes:
  Revert "Correct recycling to take setViewId into account."
  Revert "Ensure the view being recycled has been inflated before."