Merge "Revert^2 "Add waiting screen before PS setup completion"" into main