Merge "Block clipboard UI when device is locked" into tm-dev