Merge "Make hasTransientState be true only if user created selection is active." into nyc-dev