Merge "Prevent bouncer from showing during unlock animation" into udc-dev