Merge "There should be an UNKNOWN state to handle more conditions" into qt-qpr1-dev