Merge commit '96757ff1498345bef8735791da1ca147b2247f13' into eclair-mr2 * commit '96757ff1498345bef8735791da1ca147b2247f13': Update LockScreen/UnlockScreen for new UX designs.