Merge "Remove app switch code" into main