Merge "Closing folder in onSaveInstanceState" into ub-launcher3-calgary
am: 77b3e1a57b

* commit '77b3e1a57ba0801c3def173c0f6c8089eb4591f7':
  Closing folder in onSaveInstanceState