Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev