Merge "Add unlock to see more messaging to locked shade" into tm-qpr-dev