Merge "Update SystemUI build flag for optimization"