Merge "Prevent media button receivers targeting activities" into udc-dev