Merge "Adding option in global setting to control the display message during user switch"