Merge "Handle user context switch in CustomTileMapper" into main