Merge "Fixing issue with screen-pinning for secondary users."