Merge "Unminimize to save divider position after rotation"