Merge "Show FSI when device is not provisioned" into main