Merge "omni: add EmptyOverlay" into android-10