LPS-33320 Use ServiceContext instead of ThemeDisplay
LPS-33320 Forgot Bookmarks
LPS-33320 SF
LPS-33320 Properly deprecate the class
LPS-33320 Add new helper methods