Merge "Misc fixes for account/users fragments"