Merge "Fix 3373106: add hint text to PasswordUnlock" into honeycomb