Merge "Generate new field short_name_hash for atom ForegroundServiceStateChanged." into sc-dev