Merge "Fix 5473038: workaround for fd leak in lockscreen" into ics-mr0