Merge "[Dev option] Add a aconfig flag for wheather to show DW dev option or not." into main