Merge "Unhide the proximity sensor wakelock." into lmp-dev