Merge "Adding widget auto-advance capability"