Merge "Fix message for screen unpinning" into nyc-mr2-dev am: b0181b634e
am: 0cf4bd3bca

Change-Id: I3b4291efeb7af34a99f016b9568d2cdee76cda87