Merge "Cleanup IPinnedStackController and IPinnedStackListener 2/N"