Merge "Adding callback support for Entering/Exiting DesktopMode" into main