Merge "Move updating layoutParams outside of dispatchDraw()" into main