Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev