Merge "Fix crash of NavigationView on Gingerbread" into lmp-mr1-ub-dev