Merge "Add flags for com.android.internal.widget" into main