Merge "Fix title when changing from portrait to landscape configuration"