Decorated custom views now behave better if no custom view is set

Bug: 27386952
Change-Id: I40ebd66830b1d0cb124e9a9019c6ead8dcf4d599
1 file changed