Merge "Toast app icons should show for secondary users"