Merge "Add SYSTEM_APPLICATION_OVERLAY"