Merge "Revert "Add systrace tag for system property"" into sc-dev