Merge "User action should only stop lock task mode if it is in pinned mode" into nyc-dev