High-end GFX Toggle [2/2]

Change-Id: I5b6fce458ee15da69c533c75c8a460f02142ccab