Merge "Add AppNavigation demo" into ics-mr1