Fix bad merge
Fix build after active display
Active Display : add Full Screen Flag for AOKP

for we have hidden navbar