Merge "Fix crash issue on Storage Manager app"