Merge "Address some comments for the soft restriction CL" into qt-dev