Merge "Security Fix: Race Condition + NPE" into qt-qpr1-dev