Merge "Consistently checking state change messages" into ub-launcher3-master