Merge "Make some IStatusBar APIs support multi-display(1/N)"