Merge "Allow AppCompat's compat onClick to work on all devices" into mnc-ub-dev