Merge "Add timeout to wakelock acquire"