Merge "AOD: Hold WakeLocks 100ms beyond release"