Merge "Add a CTS case to catch non-recycleable view types bug" into mnc-dev