Merge "Move data stall definitions out from Setting" into qt-dev