Merge "Fix recents split-screen icon" into oc-dr1-dev
am: 148db9dfa6

Change-Id: I5446350fed23d757d9cae5db5012d660828e9236