Merge "Use WindowConfiguration to match DeviceProfile in IDP.getDeviceProfile" into main