Merge "Revert "Fix 5797764: Increase lock screen's thread priority"" into ics-mr1