Merge "Revert "Add missing check of avoidMoveToFront when starting activity"" into main