Temporarily fix FC on Devices without NavBar

Change-Id: I29bab7816f1cf7a94f7621b688820d5677188bd4