am fa475884: merge in master-release history after reset to cdb70a71717005904c8fc20b41c36513b1875b52

* commit 'fa475884406192526fe93c18b1ad563be5f35210':
  fix fast relayout bug