Merge "Add config option to enable/disable pause workaround."
am: 9282d725f0  -s ours

Change-Id: I6e54ff11618e8a49cb20391f10f8f79adc61463d