Merge "Fix lockscreen wave animation artifacts" into klp-dev