Merge "Release wakelock after use" into honeycomb-mr2