Merge "Set transient state for focus container in ListView"