Merge "Manually integrating froyo lockscreen fixes:" into kraken