Merge "Remove old Desktop transitions flags usages" into main