Merge "Add title bar indicator to tab"