Merge "Fading PS container on hide." into main