Merge "Silence errors when probing for AppCompat views"