Merge "Skip handling recents toggle if a task is locked." into oc-mr1-dev am: 8d1a86ca0f
am: e348f3253b

Change-Id: I285c45f5b5de0feac06955eded561f013b4ef5a1