Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0