Merge "sysui: refactor NavigationBarInflaterView"