Merge "Move HAS_TRANSIENT_STATE flag into a safe area." into jb-mr1-dev