Merge "Add transient state tracking to Views"