Merge "Fix keyguard listview widgets for secondary users"