Merge "Add waiting screen before PS setup completion" into main