Merge "Force update uid state when pending uid state is applied" into qt-dev