Merge "Remove TODO related to WakeLocks"