Merge "Fix Spinner not restoring selection when set to GONE"