Merge "Add support for AppCompat widgets"