Merge "Set tile label when state is updated" into rvc-dev am: c4012e1bd5 am: 5f7443750b

Change-Id: I9a4abcd049e26028629f0eaa711663f79762938b