Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into...