Use ViewStub for setEmptyView (bug 1803058)

and use <merge> instead of FrameLayout
4 files changed