Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1