Merge "Correctly release lockscreen lock on tile destroy." into cm-10.1

Change-Id: I6c399e6e950d3448042bb95a2cd9bb61a8c26353