Merge "Add provisioning extra definition to skip education screens" into qt-dev