Merge "[Settings] Avoid access Controller from Slice" am: 5fb5d21b2d am: 9901d4262a

Change-Id: I842ec0be059ce9c2ee09ea80a344beeb071cfa22