Merge "Avoid skipping animated status bar icon frames." into klp-dev