Remove ActiveDisplay from Settings

Change-Id: Ieabb47951161ee5a79f225e7d97d87370177fb52