Merge "Fixed pinned stack lockscreen interaction" into oc-dev