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

Change-Id: I1773f81561c53e1a69204e2c3d58a00c16ff5f09