Merge "Temporarily enable screen wakelock logging in WM" into oc-dev