Merge "Add S checks around identity decoration set/get API" into sc-dev