Merge "Replace auto-create in findViewById() with explicit create() API"