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

Change-Id: I6e240465679b5050fdbcb6030e6a281fd5c27719