Merge "fix RuntimeException when inflating default layout for AdapterView-based widgets" into rvc-dev