Merge "Fix 5458658: Fix memory leak in lock screen" into ics-mr0