Re-add Perfomance Control and Advanced Settings

Change-Id: Iea3c9a17f8ca8b185398d64dafdcb3b949dfc1ff