Merge "Textfield assets from Gingerbread for compatibility"