am 9e96c69e: am 6757572b: Merge "Add throwing InvalidDisplayException from...
am 9e96c69e: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
* commit '9e96c69e':
Add throwing InvalidDisplayException from addView.