Merge "Avoid creating a new data obj on every onUidStateChanged() callback." into sc-dev