Merge "Update immersive cling dialog" into main