fixed my derp in Active Display + option to disable flip animation

Change-Id: I4bc07c2b98439f2534ba2d05dfa0c03260d27a96