Don't hide organization fields on rotation if they are expanded

Keep track of whether or not organization fields are expanded so that
we can restore this property on rotation

Bug: 6009291
Change-Id: I525606c940ffa66458e689cfc6e376d8719de4d8