Merge "Hide the other preview when entering the secondary screen (2/2)" into main