Merge "Reduce creating unnecessary display for unit test"