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

Change-Id: I602c24f1e873386afa6680ab23ed3176463a5f6c