Merge "Fix 4368649: Fix visible password issue on password unlock screen"