Merge "SystemUI: Relax AVC level requirement"