Merge "UserDataPrepare: CE storage property set too early." into pi-dev