Merge "Add extra logging for media button events"