Merge "Remove pieces of device entry flag" into main