Merge "Sort applications to avoid backup data change" into main