Merge "Prevent ArrayIndexOutOfBoundsException for some invalid sysui_nav_bar values" am: af5b90ff45
am: e01fe74110

Change-Id: I24ac819e4d9edd59c7e4dac5ee5dea8ed4fc0148