Merge "Update AOSP launcher icon" into lmp-dev