Merge "Move ImeAwareTextEdit from Settings to android.widget" into rvc-dev