Merge "Sync for HeadsetMediaButton" into mnc-dev