Merge "Adding callback when surface params are applied" into qt-dev