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

Change-Id: I84d8706696ebfc72c66637b34e101f836d398551