Merge "Add MediaController.getHandlerForCallback() for testing"