Suppress dontDispatchChangeDuringLayout until lollipop am: 7a21a1510d
am: bde0a1a9f8

Change-Id: Ifc1f84fe4d66dbef0ef32049f953fa88a8db5ae7