Merge "Fix NullPointerException in DreamManagerService"