PLF-4578 [Welcome Screens] Fix some Regression due to Relooking