Merge "Revert "Re-add performance optimization in View""