Merge "Restoring mLayout has private in TextView"