Merge change 24183 into eclair

* changes:
  Fix b/2105945 - Windowshade not closed when device locked.