Merge "Remove a view from disappear list on recycle" into lmp-mr1-ub-dev