Fixing incorrect lifecycle calls
Retrofiting settings section