Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev