fix(#4282): fix $parse errors in avatar customize screens
fix(#4282): refactor for DRY unlock/hide paths