Merge "Replace AutoFillType by view constants."