Merge "Fix NPE in MediaController2"