Merge "Fix NPE when scheduling transaction for null client" into qt-dev