Merge "Revert "Reduce invocation of surface placement of switching activities"" into sc-dev