Merge "Use userId 0 to bind the DisplayHashingService" into sc-dev