Merge "Backport framework changes to AppCompat" into nyc-dev