Merge "Add a new flag ALWAYS for layoutInDisplayCutoutMode"