Changed how MultiStateFragment state handling is done