Merge \"Fixing issue with screen pinning screen not showing for secondary users.\" into nyc-dev
am: 9a75ed7ab5

Change-Id: I8dffa83fc2f3cb031062412171453dc7d19a2e66