Keep data only on apply style. Remove them on remove style.
Minor code improvement.
Merge branch 't/11258'