Merge "Removed SoftInputShownOnFocus methods in TextView"