Merge "SystemUI include static lib WindowManager-Shell(1/N)"