Merge "Support hide display cutout with display area"