Merge "Fix SearchView measure for UNSPECIFIED height." into nyc-mr1-dev