am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev

* commit '6757572b39d3802c4d7b69467b5ebf69a96c208b':
  Add throwing InvalidDisplayException from addView.