Merge "Screen-pinning unpin security fails for secondary user. DO NOT MERGE" into oc-mr1-dev