Merge "Fix Wakefullness lifecycle NPE"