Merge "Prevents an extra Widget shortcut from showing when popup receives update." into tm-qpr-dev