Merge "[PIP2] Fix NPE crash when entering Maps" into main