Merge "Stop scroll when layout manager is replaced." into mnc-ub-dev