[automerger] Preventing padding from getting reset when the widget updates am: 4cbbaedb2c

Change-Id: I851c06714e0809a9afb108b8c66a0d01384e3c41