Merge \\"Fixing issue with screen pinning screen not showing for secondary...
Merge \\"Fixing issue with screen pinning screen not showing for secondary users.\\" into nyc-dev am: 9a75ed7a
am: 43fb1f2e
Change-Id: I8d63ffb4111b6bb52a1a3a23bf326b6f8c4860ba