Fix crashes with NavDrawer when running in Strict Mode

Change-Id: I8ecdbcf81c1db284e40e07bdd9fe20bc11fe947a