am 74fbeb48: Merge "Fix graphics corruption in WiFi password dialogs"

# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '74fbeb48d6b2b34b841004317bc67884cc1eb5d0':
  Fix graphics corruption in WiFi password dialogs