Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev