Merge "Add fade out/fade in animation in PS setup auto advancing screen" into main