Merge "Set tile label when state is updated" into rvc-dev