Merge "Enabling secondary deviceprofile creation in windowcontext" into main