Merge "Add NavigationView usage to SupportDesignDemos" into lmp-mr1-ub-dev