Maps crashed entering PIP right after... am: 598c497be3
am: d4a5b56c41  -s ours

Change-Id: I16abfd720e4268f73d0205e40013f386d98a05d2