Merge "Catch (and ignore) any timeout exceptions when releasing WakeLock" into oc-mr1-dev