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