Merge "Add FLAG_IMMUTABLE in DevTools app"