Merge change 646

* changes:
  Use ViewStub for setEmptyView (bug 1803058)