Merge "Add a configurable toast debounce time" am: 44da84c0f0 am: b526d198fc

Change-Id: If729cffa8e007be25111dcac5a6021dc505df147