Merge "Add additional dirty checks in updateWakefulnessLocked"