Merge "SystemUI:System UI crash in APM"