Merge "Avoid unnecessary smaps logic during app compaction" into sc-dev