Merge "Fix NullPointerException in MediaDevice"