Merge "Use correct back icon for xxxhdpi" into lmp-mr1-dev