Merge "Use String for custom bp and flag showing custom view." into main