Merge "Closing folder in onSaveInstanceState" into ub-launcher3-calgary