SW: Add persistence to Component Selector state
Authored by: arcachofo 2017-06-20
Parent: [r100]
Child: [r102]