Merge "Stop trying to draw a view not attached to the view tree" into sc-dev