Merge "Screen-pinning unpin security fails for secondary user."