Merge "Cleanup IPinnedStackController and IPinnedStackListener 1/N"