Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1