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

Change-Id: I2f2f6d3c6177f1324421643e01e9bd6cf20b6d75