Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev