Merge "Fix issue #64140901: Maps crashed entering PIP right after..." into oc-mr1-dev