Merge "Add TabLayout UI to on BaseActivity and show it conditionally"